bug fixes go brrrr